Better handling of get Intent Extra
Merge pull request #5 from mitchross/refactorwork-cakewalker

Better handling of get Intent Extra