Made changes to preserve ABI and API in future
Merge pull request #70 from euroelessar/master

Made changes to preserve ABI and API in future