Merge and declaring java 1.7 version
Merge with Master