Working on a cleaner version.
Merge branch 'master' of github.com:ironwallaby/samsara