Merge pull request #67 from literator/develop

Added optional unwrapping which caused compilation error