Dev

Fixed issue https://github.com/pheelee/tinynfogen/issues/9 and issue https://github.com/pheelee/tinynfogen/issues/10