Merge pull request #3 from abiskop/master

style, fixes #1