Merge pull request #1 from frontendfriends/master

.
Merge pull request #3 from furzeface/master

Merge pull request #1 from frontendfriends/master