Refactoring to match ear support & framework code to internal codebase
Fix Nullpointer exception in RSpec caused by race condition
Merge pull request #27 from chibi03/upBranch

Refactoring to EAR support & framework code