Merge pull request #105 from SAMdroid-apps/docker-options