Merge pull request #9 from cnoon/develop

Fixed an optional issue with Beta 7.