This commit references issues #8,#9,#10 and #11