Fixed issue 27
Merge branch 'master' of github.com:talymo/barkshack