Working in the issues #11, #13 and #14
resolve conflict of version