Merge pull request #20 from 51seven/master

Changed branches
Merge pull request #22 from 51seven/master

to Master
Merge pull request #23 from 51seven/master

Master
Merge pull request #24 from 51seven/staging

adsfasdfasdfadsfasdfasdf