merges TheRobin1226:patch-1 closes #50