fixed bugs
Merge pull request #14 from dcs24/master

Bug fixes