Should fix issue #13
Hoping that bug doesnt occur again.
Merge branch 'dev'