Removed static main method
Merge branch 'connector-code'