Kanjivg

Merge with master for quick travis integration