Synced with upstream and added files to gitignore
Port changed
Merge pull request #5 from kchomski/new_port

New port