Dev

Implemented issue#6, fixed issue#3.