Merge pull request #2 from kvint/dev

Dev merge
Merge pull request #3 from kvint/scifi

Merge pull request #2 from kvint/dev