Moved to objects
Merge pull request #5 from adamruzicka/master

Moved to objects