fixed bugs
Merge pull request #60 from where2night/Adrian

fixed bugs