Wrong title fixed
code refactorings
#48 fixed