working
Bugfixes
Merge pull request #20 from smiling-Jack/Working

Bugfixes