bugs
Merge pull request #17 from IPunchu/bugs

bugs