ChicagoBoss/ChicagoBoss — pull request #443 by danikp (2014-02-24 12:35:19+00:00)
Title: merge changes from @davidw branch

merge changes from @dawidw branch