Merge pull request #1 from spectrumbranch/master

Updates
Fixed Issue #17
Merge pull request #2 from spectrumbranch/master

Pull #2
Merge pull request #3 from spectrumbranch/master

Pull request #3
Merge pull request #4 from spectrumbranch/master

Pull #4
Issue #18