Merge branch 'bugfix/issue/11' into develop. closes #11
Merge branch 'develop' of github.com:joakibj/tswcalc into develop