Fixed #22
Merge branch 'dev' of ssh://github.com/Farenheight/Lidkoping-SH into dev