Merge pull request #9 from fgwei/master

Modified Amandroid.scala in option
Merge remote-tracking branch 'upstream/master'