fixing issues #11 and #12.