Fixes
Merge branch 'master' of https://github.com/rasmus-telerik/Hackaton