Merge pull request #64 from efraimgentil/master

#2 and Small refactors
#50 Woking on session handling
Merge remote-tracking branch 'upstream/master'