Merge pull request #18 from cymerio/master