added Feature.java
Merge branch 'NewFeature'