Merge pull request #1 from luridarmawan/development/luri

compatibily issue
Merge pull request #1 from luridarmawan/master

compatibility issue
Update compatibility between latest stable and trunk

Trunk should use faster solution, but latest stable should still be able
to compile