Some new alternatives and fixes
Merge pull request #11 from wakeup/master

Some new alternatives and fixes