added features
Merge branch 'master' of github.com:analogbit/barbatus

Conflicts:
	barbatus.py