Version 0.0.3 correct issues #5 and #6