merges youmadornah/patch-1 closes #46