Merge pull request #16 from evoskuil/develop

Make current lib naming consistent.