Fixed bug on c4droid, beginning implementation