Midhack commit
Merge branch 'master' into reset-feature
Merge branch 'empty-beacon' into reset-feature
Commit before clean up
Removed key features
Clean up
Minor whitespace and comment added
Merged with master
Merge pull request #66 from g-ortuno/reset-feature

Reset feature implementation