Some new additions

Fixes
Merge pull request #7 from stanleyapp/develop

Some new additions