fixes
Merge pull request #17 from samanpwbb/fancy

fixes