Issue 38

This may solve Issue 38, the automatic fallback is removed.

I also did some code formating and added some unit tests.