see #13
this is intending to be merged directly as accepted
@ksunden please read closely and make any necessary comments now