version 1.1 for osccon
Merge https://github.com/dgaff/oscon