Cleaning...
Merge branch 'fea_fixture'
Merge pull request #20 from sparkica/master

Cleaning....