Merge pull request #46 from yllekkram/mark-master

Cleaned up some code