asdf
some improvements to feature
Merge pull request #2 from oogabooga/bar-feature

merge feature bar