Fix and close #18
Merge branch 'master' of github.com:developius/bluecode-intranet