Merge pull request #156 from JetAlone/issue/initial

Issue/initial