-implemented feature [#11]
-implemented feature [#12]
-refactoring
Merge remote-tracking branch 'origin/master'