Move option

Move option
Merge pull request #196 from AlexAlexandru/master

Move option