Merge pull request #1 from jcoleman/master

merge newest master
fixed NullPointerException in createSession
Merge pull request #41 from peh/master

Fixed Issue #40