fixes
merge
Merge pull request #15 from tomaszrondio/master

fixes