Add features to implement
Merge pull request #12 from kojoman/dev

Add features to implement