Fix #2
Merge branch 'dev' of github.com:SESman/SES into dev