Merge pull request #23 from MrBean83/working_from_home

Working from home
what?

ranch 'master' into working_from_home

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.