Merge pull request #3 from mobilejazz/master

Update from mobilejazz:master
Convenience header
Merge pull request #7 from robotmedia/master

Convenience header
Merge branch 'master' into development