Merge pull request #26 from kostya-viktorov/master

Updating
Fixed some weird bug, ask Dan.
deleted crapppp
woohoo.
Merge pull request #13 from praccu/master

Updating