fixes
Merge pull request #1 from adammbalogh/master

fixes