Initial commit part 2

Signed-off-by: Alex Rydzak <alex@rydzak.me>
Merge pull request #1 from alexrydzak/dev

Initial commit part 3