Fix many bugs
Merge pull request #14 from iven/master

Fix many bugs